Add xmapwpt.style back in. Exclude custom stye. Thanx, Alex Mottram!

diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c
index d86d468132359a3e372909630b2f4a36612b733d..2045141420228710b593e9d190b70f0139e56e4e 100644 (file)
--- a/gpsbabel/internal_styles.c
+++ b/gpsbabel/internal_styles.c
@@ -376,5 +376,37 @@ static char xmap[] =
 "IFIELD        LON_DECIMAL, \"\", \"%08.5f\"\n"
 "IFIELD        DESCRIPTION, \"\", \"%s\"\n"
 ;
+static char xmapwpt[] = 
+"# gpsbabel XCSV style file\n"
+"#\n"
+"# Format: Delorme Xmap HH Street Atlas USA .WPT (PocketPC)\n"
+"# Author: Alex Mottram\n"
+"#   Date: 12/09/2002\n"
+"#\n"
+"# \n"
+"DESCRIPTION           Delorme XMat HH Street Atlas USA .WPT (PPC)\n"
+"SHORTLEN              32\n"
+"SHORTWHITE            0\n"
+
+"#\n"
+"#\n"
+"# FILE LAYOUT DEFINITIIONS:\n"
+"#\n"
+"FIELD_DELIMITER               COLON\n"
+"RECORD_DELIMITER      NEWLINE\n"
+"BADCHARS              COLON\n"
+
+"#\n"
+"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
+"#\n"
+"IFIELD        CONSTANT, \"1296126539\", \"%s\"\n"
+"IFIELD        CONSTANT, \"1481466224\", \"%s\"\n"
+"IFIELD        LAT_INT32DEG, \"\", \"%d\"\n"
+"IFIELD        LON_INT32DEG, \"\", \"%d\"\n"
+"IFIELD        CONSTANT, \"3137157\", \"%s\"\n"
+"IFIELD        SHORTNAME, \"\", \"%-.31s\"\n"
+"IFIELD        IGNORE, \"\", \"%-.31s\"\n"
+"IFIELD        DESCRIPTION, \"\", \"%-.78s\"\n"
+;
 #include "defs.h"
-style_vecs_t style_list[] = {{ "xmap", xmap } , { "s_and_t", s_and_t } , { "ozi", ozi } , { "nima", nima } , { "mxf", mxf } , { "gpsman", gpsman } , { "gpsdrive", gpsdrive } , { "dna", dna } , { "custom", custom } , { "csv", csv } ,  {0,0}};
+style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "s_and_t", s_and_t } , { "ozi", ozi } , { "nima", nima } , { "mxf", mxf } , { "gpsman", gpsman } , { "gpsdrive", gpsdrive } , { "dna", dna } , { "custom", custom } , { "csv", csv } ,  {0,0}};

diff --git a/gpsbabel/mkstyle.sh b/gpsbabel/mkstyle.sh
index cf5650bce329030414a139741a5d24d393a7813d..1cec89a523a8b8169ea0e339d4cc18cfc7ab2f8e 100755 (executable)
--- a/gpsbabel/mkstyle.sh
+++ b/gpsbabel/mkstyle.sh
@@ -3,6 +3,7 @@ for i in style/*.style
 do
        A=`basename $i | sed "s/.style$//"`
        [ $A = "README" ] && continue
+       [ $A = "custom.style" ] && continue
        ALIST="{ \"$A\", $A } , $ALIST"
        echo "static char $A[] = "
        sed 's/\\/\\\\/;s/"/\\"/g;s/\(^.\)/"\1/g;s/\(.$\)/\1\\\n"/g' $i 

diff --git a/gpsbabel/style/xmapwpt.style b/gpsbabel/style/xmapwpt.style
new file mode 100644 (file)
index 0000000..270ad96
--- /dev/null
+++ b/gpsbabel/style/xmapwpt.style
@@ -0,0 +1,30 @@
+# gpsbabel XCSV style file
+#
+# Format: Delorme Xmap HH Street Atlas USA .WPT (PocketPC)
+# Author: Alex Mottram
+#   Date: 12/09/2002
+#
+# 
+DESCRIPTION            Delorme XMat HH Street Atlas USA .WPT (PPC)
+SHORTLEN               32
+SHORTWHITE             0
+
+#
+#
+# FILE LAYOUT DEFINITIIONS:
+#
+FIELD_DELIMITER                COLON
+RECORD_DELIMITER       NEWLINE
+BADCHARS               COLON
+
+#
+# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
+#
+IFIELD CONSTANT, "1296126539", "%s"
+IFIELD CONSTANT, "1481466224", "%s"
+IFIELD LAT_INT32DEG, "", "%d"
+IFIELD LON_INT32DEG, "", "%d"
+IFIELD CONSTANT, "3137157", "%s"
+IFIELD SHORTNAME, "", "%-.31s"
+IFIELD IGNORE, "", "%-.31s"
+IFIELD DESCRIPTION, "", "%-.78s"